Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / config.xml

diff --git a/ruralHouses client/config.xml b/ruralHouses client/config.xml
new file mode 100644 (file)
index 0000000..d80475a
--- /dev/null
+++ b/ruralHouses client/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+       <businessLogic local="true">
+               <businessLogicNode>localhost</businessLogicNode>
+               <portRMI>1099</portRMI>
+               <serviceRMI>RuralHouses</serviceRMI>
+       </businessLogic>
+       <database local="true">
+
+       <databaseNode>localhost</databaseNode>
+       <db4oFilename>db/casas.db4o</db4oFilename>
+       <dataBaseOpenMode>initialize</dataBaseOpenMode>
+       <activationDepth>10</activationDepth>
+       <updateDepth>10</updateDepth>
+       <databasePort>8100</databasePort>
+       <user>softEng</user>
+       <password>i4softwEngin2matx</password>
+</database>
+<javaPolicyPath>java.policy</javaPolicyPath>
+
+</config>
\ No newline at end of file